Merge cherrypicks of [16367127, 16439178] into sc-platform-release.

Change-Id: I6575b3c647c1d2c684a9ba5e65dda7adf8b1045a