Merge master@5406228 into git_qt-dev-plus-aosp.
am: 7a129c706d

Change-Id: I684e995988f5a8ef330fbbf55da7ae9230f0cfc2
tree: 4bf3a475f295cb395977f9b295b26bbff8260b4d
  1. core/
  2. services/
  3. tests/