Merge cherrypicks of [17939448] into sc-qpr3-release.

Change-Id: I02638540c2ac00806b19da02bf6cffeeeea34cf4