Merge "Fix broken test due to API rename" am: 0abc93177f am: ee898c81a7
am: d569d33ac4

Change-Id: Ie52ce3da0507421313a73688e831d3802b888cfd