Merge "Camera: add proper nullptr check" into oc-dr1-dev am: 4b5215993a
am: 1097d57d29

Change-Id: I5a55ad2126028f5c47f93f497a10590eaa62db95