Merge cherrypicks of [15466710] into sc-release

Change-Id: I15ee0e8355642f58d77a584cdee9b5bf9d96daff