Merge \\\"Provide default fallback in theme\\\" into nyc-dev am: 7c8360980c am: 0f31c75051
am: 5d296e28d5

Change-Id: Iada2d2f8ee2707621304184e8191f2754bde4acf