Merge "Update CTS to use renamed API method." am: 123988e6e1
am: 51fc96db37

Change-Id: I4c64458a793b56b3daf11287d340ead4bd40948d
tree: 0c8658f0cfd0582a3f2dca2049fd8496e178baff
  1. tests/