Merge "Fix sanitizer in setViewportAndProjection." am: 739c8b7cea am: e3d84283f8
am: 6531a6dc23  -s ours

Change-Id: I74a2ceafb4684c4bf92867ca836cc9ca4b24328c