Merge "Fix sanitizer in setViewportAndProjection."
am: 739c8b7cea

Change-Id: I3efaf108b2da49e9b41bf888af19e45586920687