Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ia973870c6925fdfd8ab81a5d645b2600f8a3419b