Merge "Revert "Example for disabling changes at test time"" am: 3914defb43 am: ca3e2d327d am: 5f09be783e
am: 7efb81a2e7

Change-Id: I4315d5fef3f3b10c6af44e3adb15324d85af3c81