NO_IFTTT=Catalyst only Bug: 368360218 Flag: EXEMPT refactor Test: atest Change-Id: I3c308b0ed1462a10ddd0daf55f30996a23e747d7
ccf197b366
9b18787489