Merge "SnapdragonCamera: Fix FC because of NullPointerException"