Merge "[automerger skipped] Merge "Check for null in applyDefiningSharedLibraryUpdateLocked." am: 801862313f am: 0407b12c00 am: 4a4aba19b3  -s ours"