Merge "[automerger skipped] Merge "Check for null in applyDefiningSharedLibraryUpdateLocked." am: 80186231 am: 0407b12c am: 4a4aba19 -s ours"