Merge "Incorporate random profile tests into run-test." into oc-dev am: 55aed542f4
am: 51d992b57e

Change-Id: I2cf159fa26e27508af5a972de9101ea3cb5038b1