Merge "Remove need for intrinsic recognizer to be a pass."
am: 0de9c08aef

Change-Id: Ie3ba280b7e2367a8d8af54a090524e74351a4660