Merge "Prevent NPE, add logging for tracking down root issue." into oc-dr1-dev am: cb9f6de368
am: 45f96a350a

Change-Id: I76d640f5bd8387390f2cf3fdb87703e0f2d686d1