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

Change-Id: I44ab8310928658c38bae9522b31515ee6c36d6d2