Find7/7a unified bringup

Change-Id: I97049f30430c1b2660dc5e6b70a87eee520932aa