Merge "Further increase framerate limits" into oc-dev am: d8f2c2b46c
am: 15cb58b4bb

Change-Id: I6d010c60a8516c36d81e70a6537c6e811c0ef179