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

* commit '653aa40ef5d21286382217a36d956213a1018b37':
  update viewport variable with new underscore format