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

Change-Id: If35cc428ba5173b7b7ec56aed5a6c9910b41d2ff