Merge cherrypicks of [16266130] into sc-qpr1-release.

Change-Id: If29da14bad6d38712e99213af4411e4830dce085