am: 6b171660 * commit '6b171660': Modify tests with parameters to work with CTS Change-Id: I1ea34668c572992150d79bf271dcc4abc5f4dbd5