Merge "Patch error in which --retry filters parameterized tests" into oc-dev
am: cbbcd817a3

Change-Id: Ib23acc4d3fd79019891d9998bf1e21c21e93ea65