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

Change-Id: Id09e95e39d85393c570840372ee38a89dc2447b9
tree: 4ee92fedb94a2d6506473e84897e263f4d7211f0
  1. tests/