More changes to tf101

Change-Id: I3e2ca152b407afc9382649122e44e9c279a92737