Apply changes to migrate to upstream API.

Change-Id: I1b131826edb40b12f4fbc816f0b358924eea75dc
2 files changed