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

* commit '7ac0a907051287a9cb01b3b54332a7ba865102e6':
  Fix AVD for CTS failure.