Merge "Remove null check."
am: 05945e8a79

Change-Id: I9fbf1935e107a4277034ebd8a0fdfa42c3c38a63