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

Change-Id: I8089aebd0d202a61f466350e67e53079384b0a2d