Merge cherrypicks of [15424398] into sc-release

Change-Id: I563bd71c6f59a4bb4f65b26af69cedf6c74a3cee