Merge cherrypicks of [17649601] into sc-qpr3-release. Change-Id: I070c9651addca6b2f74266fe62ab2e5978c8cbfc