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