am cf19e604: Merge "Avoid 2 fails if no camera on device" into gingerbread

* commit 'cf19e6043551f36681795cd73e0d0317bbe90137':
  Avoid 2 fails if no camera on device