[coastguard skipped] Merge sparse cherrypicks from sparse-12088131-L69700030005465707 into sc-platform-release.

COASTGUARD_SKIP: I988047b742c33b7c6036c5ea6940682387c7d92b
COASTGUARD_SKIP: I87e6810467bcae0bac7f0418217b03e57c1d8c03

Change-Id: I5b212ba44236696974c92f678fc817f827e76a57