Merge "AppCompatDelegate - fix cast exception" into nyc-mr1-dev am: 72f26b9cb4
am: bd005b78da

Change-Id: Iddd6bad2f7e17db0a2c9833cda2c04bbe2b1b6fd