Merge master@5428150 into git_qt-dev-plus-aosp.
am: 2ebe94b665

Change-Id: I9324f1d823e3f971bd63a2a5bcc3d70dbec36480