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

Change-Id: I5cbd140458a6fa354551bcfb1a73b0cffcbd8453