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

Change-Id: I91ae1ebbbd4ec63ffd4b5e7d08cd54d52c259db4