am 6bdc2e08: am 7ac0a907: am c793e67c: Merge "Fix AVD for CTS failure." into lmp-dev

* commit '6bdc2e08b712f147e5aeec39afded3d723b8426c':
  Fix AVD for CTS failure.