Merge sc-mainline-prod

Bug: 189946434
Change-Id: I95a9c8803ee7b9c35ac674f5c8bde3d477a600f2