Merge "Fix an incorrect null check"
am: 09071b4fa8

Change-Id: Ie69056c21ee03e397881c14ef69804fead2202a9