Merge master@5428150 into git_qt-dev.

Change-Id: I79becd8f8282c9c1b351e631c19df90cc18e0c29
BUG: 129345239