Merge master@5428150 into git_qt-dev.

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