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

Change-Id: I7de0f704f344fc26123f8e2db767784181eaf93b