Merge cherrypicks of [16614247] into sc-platform-release.

Change-Id: I4980fe9995496cb0d5a5501135bf83dc9a009d9e