DO NOT MERGE: From master -- Update to take care of new API.

Change-Id: I35ee992dc0c7747e410d36357f525530e58785c2
1 file changed