Merge "BT: Fix glob pattern in owners file" am: a6d6ed2ec3 am: 667cf687f6
am: 0163e5788f

Change-Id: I73a9c717be950b1e463fa857caf96e9bbbd32859