Merge master@5428150 into git_qt-dev-plus-aosp.
am: e245135f93

Change-Id: I95b26c922e8b19bec14d0be9c6a93291b6b0d069
tree: aa56600ba57b2309164725331f8028cb2ecbacfa
  1. service-t/
  2. tests/