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

Change-Id: Ia97d0e5ab37c9231a6a2fd42444c3301414a8ee4