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

Change-Id: Ie4c465c2ec1d5191d6a86d5a29d2afa1427bb451