Fix cpplint errors for origin-vn directory

Change-Id: I39c707f28e15561a829e597c2fa853a624dcb6e2
Merge "Fix cpplint errors for origin-vn directory"