Merge master@5406228 into git_qt-dev-plus-aosp.
am: 7cfdb62fe6

Change-Id: I2e69047c9c78f22a6d9b3e3f24cad4015a99380f