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

Change-Id: Idadd82b005c4e5884c0ab4f9c9d616a76d62a502