Merge "Speed up verified methods"
am: 4b600964fe

Change-Id: I7a0b407cfeadc31974c4322659a8bf8b837b527a