Merge "Fix potential NULL dereference errors." am: bce5b2f971
am: 76451438d9

Change-Id: I517c8215dd8201d29d7f97ba7017164679559572