Merge cherrypicks of [15665254, 15639253, 15667784, 15667785] into sc-release

Change-Id: I72175e5b94e14894e2cfc898720f439c277e4be8