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

Change-Id: I5dd896c89d7aeb362b01893fae0df1aa55d32c3b