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

Change-Id: I684e995988f5a8ef330fbbf55da7ae9230f0cfc2