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

Change-Id: Ibff3f70b2b53a5e571a63c354d245802241501c4