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

Change-Id: I25c083449656ed2ebdfb68d20993eea5cc7a4fdb