Merge "Example for disabling changes at test time"
am: f39e53882c

Change-Id: I71349c840fe2baa598d5ef0050c32b78e409c14e