Merge master@5406228 into git_qt-dev-plus-aosp.
am: e2fd217b4c

Change-Id: If7519cde0ca214277d6e13627a9dbc6de994ceed
tree: 8fd03166731e4b2909aff4fb7776a55588283b2d
  1. tests/