Merge cherrypicks of [16727258] into sc-v2-release. Change-Id: I11445460e28a3646f3adda52846cc3cbdf99fd55