Merge master@5406228 into git_qt-dev-plus-aosp.

Change-Id: Ica3ed775529085371f0ed17944a420feea1c197d
BUG: 129345239
tree: 8f7a4464f4a9563a47c6ac4d8c058b7f0b66e6de
  1. tests/