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

Change-Id: Ic28479394db19ee6e49cb6701af6cb566c065988