Merge "camera: fix two potential null pointer uses" am: bf432cced9
am: ba1a53006f

Change-Id: Idde46fe6aeb8e747db3f703783e70fedcec18da7