Add Find 7/7a combo to Jake and moi

Change-Id: Iea3d3fe0b8e8c48bbec098199cbbb896d2efbbd0