Merge "Camera API1: relax the fps check with some margin" into nyc-mr1-dev am: 123efa3d1b am: 8748caecbf
am: ea18c3c039

Change-Id: I76db3bed952f81b27312f90477e1339a909ae053