Merge "Fix broken test due to API rename" am: 2ea0bc5ffa am: ee898c81a7
am: 9f34247bc3
Change-Id: Ie52ce3da0507421313a73688e831d3802b888cfd
This commit is contained in:
2ea0bc5ffa am: ee898c81a7
am: 9f34247bc3
Change-Id: Ie52ce3da0507421313a73688e831d3802b888cfd