Fix vioscsi regression due to automated merge with MOE tool.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=77443538