Merge "Update comment about disabling vmap dump."