Finish BEP-test-fix cherry-pick

Change-Id: I5c565cd6eabd61efb944afc2d3c613920971ed6e