Merge cherrypicks of [14647401, 14647577, 14647578, 14647582, 14649097] into sc-v2-release

Change-Id: Ie9da3ba73f48094af3f3e097cf89685f07ff9de6