Merge "Further increase framerate limits" into oc-dev
am: e5dec5b51b

Change-Id: I0d7c703371f182f282b66ed68df749a8813ba75b