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

Change-Id: Iec996f62717b30e2f4f9a79e9511bbfc09d85b69