Follow CM's camera regarding resolutions

Change-Id: I242c260b611988eaa6299d3a240faf430300dbd0