Merge master@5428150 into git_qt-dev-plus-aosp. am: c74d761b3d Change-Id: I6235b2099aaf7861e38f27f996e0bb3f10e1a099