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

Change-Id: I66b6766f26cdd24b7722659c56f2a9bed993af7f