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

Change-Id: Ibd7de1369915695065dc4516331de47a9eee4aea