Merge "Camera: fix off by one error" into pi-dev am: 4003570f57
am: 55321dbd5d

Change-Id: Ie21a397348d8eef4f7be7b14a2aa9f214ddd6b61