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

Change-Id: Id7d5528c5b077dc20a57124d9383a2803da95075