Clean-up after view_controller args patch

R=arv
BUG=

Review URL: https://codereview.appspot.com/9314043