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

Change-Id: I746cc4c978228036ef8fbdec6f17e56d84181c92