Merge "Modify tests with parameters to work with CTS am: 6b17166 am: bccb06e" into nyc-mr1-dev-plus-aosp