Merge master@5428150 into git_qt-dev-plus-aosp.
Change-Id: I28f88c70209c7b32116a3223780501a46a8609f5 BUG: 129345239
No related branches found
No related tags found
Change-Id: I28f88c70209c7b32116a3223780501a46a8609f5 BUG: 129345239
mentioned in commit 1921a834