Merge \\\"Fix TintContextWrapper not always handling vector assets DO NOT MERGE ANYWHERE\\\" into nyc-dev am: 1e87f4ec3f  -s ours am: 21324ead01  -s ours
am: 171f1a4e4d  -s ours

Change-Id: I700451e4d3510d1ea8143e431f66fbc9ad137e36