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

Change-Id: Iae1b5c1c6e1fcf77eba8af82a23bfc5639054eca