Remove Focal from tracking

Change-Id: Ic48ff9081a93884eea1542837fabebcd4cbe83e4
Merge "Remove Focal from tracking" into jb-mr2