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

Change-Id: I5abb2ede9f92c8a028ef67fe956c921cf26c727c