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

Change-Id: I8d0fe57e776b5a0cad3fab965e4a413d0eead864