Merge "Camera API1: relax the fps check with some margin" into nyc-mr1-dev