Merge master@5406228 into git_qt-dev-plus-aosp.
am: 5b2ad1476e

Change-Id: I0a27012094e6e55540447d1e5badb843f38a6590