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

Change-Id: Ife0821648915d11feee4b18f027d264cf7f4a45d