track bionic from RF

Change-Id: I19515685a6efcc5eca87d32c95ac990bba344f13