Merge "Re-parameterize uirendering tests" into oc-dev
am: 0f42424bc7

Change-Id: I2f7fef6533574096b2b9b0fd426d78a63d0ec010