Merge cherrypicks of [15687253, 15687254, 15687255, 15687532, 15687533] into sc-release

Change-Id: I72e5e9548cccf9e9ba6d57c8f9e335cf9a979753