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

Change-Id: I2f21175998134e3ac03279307e7d6bb163614ce9