Merge master@5428150 into git_qt-dev-plus-aosp. am: 7aba7baf41 Change-Id: Ic8dc3c3c41f626f832b341c5ab668b159c62de64