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

Change-Id: I575c815b13a19d189e6677a2f83f705ba0f70082