Merge master@5428150 into git_qt-dev-plus-aosp.
am: 2a034c9230

Change-Id: Ib480e7df7263d38b08e8ffaa3609d5917234631e