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

Change-Id: I647e73350a6b6aaa7ccc77b3c24aa47d8f6c9eba