Merge "Merge "Add a convenience method to facilitate tests" into oc-dr1-dev...
Merge "Merge "Add a convenience method to facilitate tests" into oc-dr1-dev am: 7a4157d7" into oc-dr1-dev-plus-aosp
am: fb68c413
Change-Id: I55acebc58fc7e754a37fb5f62cd41f05f27656bd