Merge cherrypicks of [14128226, 14127889, 14127867, 14127868] into sc-release

Change-Id: I7e3f925d33509adec5cd268022377f94c2f4a3a5