Merge "throw runtimeException for applicable TM APIs" into pi-dev