Merge sc-mainline-prod Bug: 189946434 Change-Id: I9403006d94d971251b88fd86871e7affdb30383e