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

Change-Id: I43a6c61c67f4e4c0fe3ca184dfd4e597462a9bb0