Merge "Rename createBaseActivityResources to createBaseTokenResources" into rvc-dev