Merge "Makes TCS methods non-abstract" into pi-dev am: 37317e1668
am: d5cc6a8289

Change-Id: I954f9bd4c150027fbaec036fa9dc1892c9a0daba