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

Change-Id: Idaab147e8a5ee98aac6aaffc78248e5fe34898ea