Merge cherrypicks of [14389499, 14389633, 14389588] into sc-v2-release

Change-Id: I40529471e1543264daaf78e546b7035a793390b1