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

Change-Id: Ic0da170dce882ef9201734fb8271d9bbaf040407