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

Change-Id: Id21f5d03d77daf0112bf7dd8fdbe4d9f13b744c0