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

Change-Id: I9e47b1ce9fa32a6965e53a999e71db9c74afe3f7