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

* commit 'c793e67ca93a1550fa68c887ef00d207ac1e1d84':
  Fix AVD for CTS failure.