Merge cherrypicks of [14457231, 14457232, 14457782, 14457768] into sc-release

Change-Id: Ia175e574730ee30df4cfe7e3017620957f244d74