The new API in 1.51 will allow null return values. Change-Id: I583690bf0740b2d0962f02edea3896e18626e548