Merge "Merge "Further increase framerate limits" into oc-dev am: e5dec5b51b am: 75d0f1973f" into oc-dr1-dev-plus-aosp