Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ib67dfc239325e73eb90dc3fcc1607c4d09d089f9