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

Change-Id: I70ff45a7f4aa214f1c54d647cbfa1dcd39bee47d