Merge "SnapdragonCamera: Sync LA.UM.6.4 to LA.UM.6.3"