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

Change-Id: I6ec4d7ef40a971744cbc14ebf3a9ec1071c0bb0a
BUG: 129345239
tree: 3b477e6d5de0d8b8cc5c3a4b3d1f391c569fc9fd
  1. core/
  2. services/
  3. tests/