Merge master@5428150 into git_qt-dev-plus-aosp.
am: e952d845b8

Change-Id: I1765b3f9d1eeeeb038c11777bfcb524851af4de5