Fix skyline

PS #2: Support f7s and f7a

Change-Id: I4bbe58eb8b439ab8c06b4d19ecf63b903ee78666