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

Change-Id: Id7b68cfc15856ae3370bb9391b46a67c7c1f5505
BUG: 129345239
tree: aa56600ba57b2309164725331f8028cb2ecbacfa
  1. service-t/
  2. tests/