Merge "Fix null deref crash" into oc-dev am: c1affe14c2
am: 1f7f8bfddb

Change-Id: I0d82bb5d05f31e9a429517417a85d7c9fc9b2c60