Merge cherrypicks of [15415825, 15422591] into sc-release

Change-Id: I3a4a5171a8f91a0e953ad8cf06130c2808322f9b