Merge "SnapdragonCamera: string changes"