Merge "Merge \\"Provide default fallback in theme\\" into nyc-dev am: 7c8360980c am: e5422efdc9" into nyc-mr1-dev-plus-aosp