am fd8c804c: Merge "Tweaked constants for Gcam." into ub-camera-glacier

* commit 'fd8c804c9429f150f6028c6f371d34352934f964':
  Tweaked constants for Gcam.