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

Change-Id: Ia53370f2096b11a3184b280f23318387d1ec6d91