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

* commit '2298938cef8d5aa2211ef08e27553354918e5554':
  More test cases from UX team for AVD.