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

Change-Id: I6685b30ea33134962f2cb3b67f9e8ff9e6c5e5b4