Merge "SnapdragonCamera: Fix null pointer exception during monkey test"