Bug 453475 - [1.8][null] Contradictory null annotations (4.5 M3 edition)

Change-Id: If21e75c9a3608085ab1cd8fcdc43bb9abf2d5024
Signed-off-by: Stephan Herrmann <stephan.herrmann@berlin.de>