am 51ec33bb: am 2298938c: Merge "More test cases from UX team for AVD." into lmp-mr1-dev

* commit '51ec33bbdf6aa533ae4c1e5f0407e8a10e3d212f':
  More test cases from UX team for AVD.