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

Change-Id: I26217d347ee091d4f39c50be99062ddc3d9ae850