Merge cherrypicks of [18590077, 18724852, 18724846, 18934602] into sc-platform-release.

Change-Id: I611391940e37b041ccc9d2c509df77f8e7ae1032