Merge "Do not call IsMarked on null."
am: 304f2d3a1d

Change-Id: Ic4e6c1fe8f924f82c10c344babdda4330188b81b