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

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