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

Change-Id: I25af16883f8b3e8e323e384a68509031c1bcf720