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

Change-Id: I16990bcdcb8e158cefc0679bc4219da5129c624a