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

Change-Id: Ifce4b4413302fae1c7efe8e3bbb48ec5617aa490