Merge "Fix broken test" into oc-mr1-dev
am: d8e7cb4b47

Change-Id: I92585de3b345b60bc0f043c512e034cc428c05d1