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

Change-Id: Ib5e3a54a1e3541eeaf2f137a5d477c98a986b5af