Merge master@5406228 into git_qt-dev-plus-aosp. am: fcebb73df9 Change-Id: I407757aa7705628164700aca9266057430b422e6