Merge master@5406228 into git_qt-dev-plus-aosp.
am: f83ef7d5c6

Change-Id: I440f0a4c551978678c1698c40b29ce0bd10e19ba