Merge "Revert "Example for disabling changes at test time""
am: 3914defb43

Change-Id: Ic6a24937dfc2918c06f63851d92796a525f33259