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

Change-Id: I977dcfa7877b7af0a2b961890914214b2b7f6395
BUG: 129345239