Merge "Re-land example for disabling changes at test time"
am: 1695301cc9

Change-Id: I9a540ff379b0c4359159b1b540352e17c5abd91c