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: f8aabcf6
Change-Id: I2fb364d7eaa6f155fa30dd2d04f1de3877e2cb56