Merge "Fix mistake in conditional + test" into oc-dr1-dev
am: ab2d96de83

Change-Id: I3514020da43434388b8be25a281c28d3d3b6deea