Merge cherrypicks of [14113092] into sc-d1-release

Change-Id: I7b645858218569a0caef0388a451000490db155f