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

Change-Id: I8bb8fe204c1e1fd796150fc3d9bdff52a8a437a7