Merge "Step 1 of 2: conditional passes."
am: 2f8279eab7

Change-Id: I0f00b3cb8a878d9057cd121f0352a85cb667fcc2