Merge cherrypicks of [18612306, 18605804] into sc-v2-platform-release.

Change-Id: I407dfaf16296de0592cd68e8391101049cea1bf5