Merge "throw runtimeException for applicable TM APIs"
am: 63437f247b

Change-Id: I3d0bcc477917c2fe27bf8024190d0f1bbd2fa585