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

Change-Id: Ia3dae062d7db5a61cebdc89b9d94ee7b89dca641