Merge cherrypicks of [16265241, 16265242] into sc-platform-release.

Change-Id: If4106ebb55b242fe81610cb38372278906b9591a