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

Change-Id: I874abc508d95176f7e58535e217bcbed42655570