Merge "Fix nullptr dereference." am: 8e1ac14f40 am: 209841d764
am: 9a0ea3ee7a

Change-Id: Id6f9de2a965021360661c00c167db939e0a04ece