am f5f47eab: am 653aa40e: am 7b190e0f: am 22b483ee: am bbaf11f4: update viewport variable with new underscore format

* commit 'f5f47eab393c8b944c0dcc87fc207b5aa1593151':
  update viewport variable with new underscore format