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

Change-Id: Ieffbf03e9e54c025eec84c0e7b4cfbe870b6523c