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

Change-Id: I426fabaae86fdf02f31021709e3e791b70e80ab3