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

Change-Id: I1a81576712a178599522c74d865fc162809bdaf4