Merge sc-mainline-prod

Bug: 189946434
Change-Id: I27e8f0f1105454f65c770f8c0fe8f4247fe488fe