am c36fbcdf: am f02f06c4: Merge "camera: check Intent entry count before reading it"

* commit 'c36fbcdf37ec02314e7b8134bb0de5f624fa70fd':
  camera: check Intent entry count before reading it