Squashed BT commits from CM

Change-Id: I95a0030725fe6a489c11e6db7d710378b3d0fcd6