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

Change-Id: I0a8dcfe842997b578f1684d0a9a0d62b49fdcb26