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

Change-Id: I25c9f2606c7d692fb1b7d40d8205122b27f74dda