Merge "Fix logspam NPE." into oc-dev
am: bd1ef76684

Change-Id: I16bfcd16236ba42302208dce37e3eb08907f2c91