Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ib2a177bb5dfa61ff7a424b94e822df313eb298f4