Merge "Fix dereference null pointer warning." am: 4065e775e6 am: 8bb45af7e9 am: 71e9c9c664
am: b7dc6d23ec

Change-Id: I0cb6805b770a4ccf3bbcb2d54771fb6f7db13a52