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

Change-Id: I6645c1d2d9f7187d70b74263471d19fd63b80f92