Merge "Revert "Revert "Example for disabling changes at test time""" am: f72b72b126
am: b5d55fad69

Change-Id: Iefc4693e6341a37d5718dda26801c22bfc6acbe9