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

Change-Id: I0572799a2af8c0229c322f0aa035555a70c04cc0