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

Change-Id: Ia769e545d390a06cf33143653b5783c07def12fd