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

Change-Id: I0897403444609b00b267206ea2749651898a52f7