Merge master@5428150 into git_qt-dev.

Change-Id: Ic7fb53f8f3865cd7ed2b1157ed6ccccd1b3aa832
BUG: 129345239