Merge "Suppress null-dereference warning"
am: 3b7ecd55f8

Change-Id: Ib1b7406ffed7c9edb3715740b8e64b9571438d23