Merge "Merge "Further increase framerate limits" into oc-dev am: d8f2c2b46c am: 91d3f41261" into oc-dr1-dev-plus-aosp