Fix demo utils test + clean-ups after PR#7120#7121

samanoelton merged 3 commits into

tensorflow:mastertensorflow/tensorboard:masterfrom

psamanoelton:fix_demo_utils_testpsamanoelton/tensorboard:fix_demo_utils_testCopy head branch name to clipboard