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

Change-Id: I37a8cf4df2a430ea1ecd2231d48bbfaa45a45d3d