Squashed BT commits from CM

Change-Id: I6c4caea5031faa5f3393bd073db8be38140f7053