Merge master@5406228 into git_qt-dev-plus-aosp.
am: 1cacfd0370

Change-Id: I0415333cf07637748cb1d66539b5a559579f99ba