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