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

Change-Id: Iaae66abc2d4709d84498522483f5042e48d7f6b4