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