Add Find7/7a unified combo

Change-Id: I5e3332e06a9e44f89ebe9d2f9b9be6d2b7035804