Merge "Inline methods that throw." am: ea7109ba4e am: 1f13c380ec
am: c61a6d7acc

Change-Id: Idbb56de0725dd160ef654a30cb1bab2942a63fea