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

Change-Id: Ic14dc666c6ed9d918f4ee47396c89ae802ab8153