Merge "Inline methods that throw."
am: ea7109ba4e

Change-Id: I80a21cc65750a52ef7bf94e8929442681c929196