Merge master@5428150 into git_qt-dev-plus-aosp.

Change-Id: I7529fd87daf2d269cb62d43b2e2a66c1b49de34a
BUG: 129345239