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

Change-Id: I037fa82b522c9c9d80c4162de45ae6aaa2b80fd0