Merge master@5406228 into git_qt-dev-plus-aosp.
am: 08465e2c76

Change-Id: I66c27279e5e9849c978c659aafffa5c24904c6f0