Merge cherrypicks of [17591709, 18766114] into sc-platform-release.

Change-Id: I38873a8b413c0e0a34b84326b6f39d4b4e474985