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

Change-Id: I620b5682bc4fa9752b1f1bf68d8ed1498db66a5d