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

Change-Id: I340e38f4d6ab53138af15e94fee03c3960eaf2e6