Squashed BT commits from CM

Change-Id: I6ae2c60db70a0143e1d25b8036695e1c90c2abdc