Merge master@5428150 into git_qt-dev-plus-aosp.
am: a90faed9c0

Change-Id: I14b49861226174f82bca09f53fc97b1fbe4a0149