Merge "Fix crash in test" into oc-dev am: d5ece513ec
am: 3a981207ce

Change-Id: I0f564ed2cee6ad4e45968704a4c64029644bbc4c