Track local bionic

Change-Id: Idcc6c6d272372f9f6b36634fe994973fd9ac9344