Merge "Add useful helper functions for tests" into oc-mr1-dev
am: 77dd2aaf72

Change-Id: Ic782b6d5efeb0dbff0fe70f80d0802fad07733d1