Merge cherrypicks of [18168004] into sc-platform-release. Change-Id: Ibbef1ead3469db61622b58b3682b472cd3c24a49