Merge "Merge changes If6fa3598,Ia969f78f am: 5715ce685d am: a5030c2f21 am: dfcb691f2e" into qt-r1-dev-plus-aosp
am: 9e2760362a

Change-Id: Iaf9f3aaaf8461d719c30b4184b6af6442e43bf21
tree: eac7b554d52ae2954ec44aa073bacd742d015476
  1. tests/