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

Change-Id: I04963e389ee1326e1aabf561676711ece66b563c