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

Change-Id: I7bab0c84d41259776dc96cc9c14b7c6b93cb919e