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

Change-Id: If3d882d35e73c41a0d5316e389d432b04edd0142