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

Change-Id: If4dc3aacacb2ef0930470327ebd81d0878e988a3