Merge "Add compatibility change preference" am: 0e7b8f7a93 am: 5f2ee93a4b
am: 555425a990

Change-Id: Ifd5e10c2aab269ca67356f68d1adcfeda0938f66