Merge master@5428150 into git_qt-dev-plus-aosp.
am: 59164a38ce

Change-Id: Ie45bdc509c74acbf6a9588020ea119a17cbc71f1