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

Change-Id: I9b1fe9559873d1f4f0ec1fbf94443cf767db9780