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

Change-Id: Ib695be16e52ca7562d6ce2433645912dccf545c2