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

Change-Id: I716cb64b1ec386b7b8623465c3cfcd5f25980e19