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

Change-Id: I09f7ec13e952a2fbd2873f4b3515c0104a51147e