- -nommio on the commandline will disble it for testing
#rb gil.gribb
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4963115 via CL 4963118 via CL 4963812 via CL 4969283
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5031108 by josh adams in Dev-VR branch]