Merge \"Return correct default theme on API >= 24\" into nyc-dev
am: afaa1e9db1

Change-Id: If520e4590d5d5b2832e3e53b25e95f6ca5e3b497