Merge "Fix null-pointer derefernce warning." am: 955e85294d am: c12499d5c6
am: aef21a74a6

Change-Id: I94ee5871a4aa3309597087c62a4911ae03ead441