Merge "Step 2 of 2: conditional passes."
am: 56189d2356

Change-Id: I416a9e86307d1d7fc8cce414b6f2658dee8e471a