NO_IFTTT=Catalyst only Bug: 377600992 Flag: EXEMPT refactor Test: atest Change-Id: I3c26a5a56d8fd6e887e4ff4d38d8e8eb97844672