Merge "Added null check for vMap to prevent static analyzer warning about potential...