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

Change-Id: Iffd3766bba50471fa624ab2a441bb3995b7ea649