Merge "Revert "Example for disabling changes at test time"" am: 3914defb am: ca3e2d32 am: 5f09be78 am: 7efb81a2 Change-Id: I4315d5fef3f3b10c6af44e3adb15324d85af3c81