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

Change-Id: I030fa1b17f02ae18628d19691016f09473d71a26