Merge "Merge "Add a convenience method to facilitate tests" into oc-dr1-dev am: 7a4157d7b4" into oc-dr1-dev-plus-aosp