Merge sc-mainline-prod

Bug: 189946434
Change-Id: I9be2ffe3d1cf6b70eabc4fe89a8a36d75171bd8f