Bug:34697653 Test: build; existing CTS tests This version takes two parameters. Matches commit 164b6937 Change-Id: I062a6d6d3c5dfd41d46d3fa2a5aa18ab27ecabf8