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

* commit '7b190e0f1df16346696465c0114179b423afc26d':
  update viewport variable with new underscore format