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

Change-Id: Id5541f172191268e2279e05505ebdda52df5bc93