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