Merge "throw runtimeException for applicable TM APIs" into pi-dev am: 17aa751907
am: 7d38883e1b

Change-Id: I3be6e23cbcc31a46759275878f4d3a5681a1bdaf