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

Change-Id: I50c6eec2baedfd4715098a0021a9d800ccf7ff9d