Merge master@5428150 into git_qt-dev-plus-aosp. Change-Id: Ia37d7a9c2163bd0d20905c59459526b09aff3a68 BUG: 129345239