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

Change-Id: I4cf8d36bb5af8cd00df1e832b9a3280faa86654c