Merge sc-mainline-prod

Bug: 189946434
Change-Id: Iba48fe797f6ec58675a864f96292e0b72badc78f