Merge "Remove call to hidden API in CTS test" into lmp-mr1-dev