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

Change-Id: I84adce06d64bd1f5f278d49c33a2398db97dd343