Merge "Guard against NPE" into oc-mr1-dev
am: fb77ca6095

Change-Id: I07004edec6634d29e44ced4d2d4d66ba7b32ab09