Merge master@5428150 into git_qt-dev.
am: 97110cf1bf

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