Merge master@5406228 into git_qt-dev-plus-aosp.
am: 273d8298fe

Change-Id: I684e995988f5a8ef330fbbf55da7ae9230f0cfc2
tree: 67854d971acedb32282b96b4b77e7444e4900c42
  1. core/
  2. services/
  3. wifi/