Merge cherrypicks of [16212023] into sc-qpr1-d-release.

Change-Id: I01996ee6b20dccedceea46de7e70598b34506598