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

Change-Id: Iea44dcd54d057ab5374a15e4e466115c4d6ba932