Merge sc-mainline-prod

Bug: 189946434
Change-Id: I42e56d1365455d6b4bfd182e1c302757197a07dc