Merge master@5406228 into git_qt-dev-plus-aosp.
am: 373ffccf9c

Change-Id: I396eabe5e27d46a9359bc3ed8480ddbfb6a54068