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

Change-Id: I6f3067105a718e84e30a9f4080647678a0829555