Merge master@5428150 into git_qt-dev.

Change-Id: Id9c9363d464c813de756bfc50ed6438b8f16b536
BUG: 129345239