Commit final (maybe) MR 2 API.

Change-Id: I42f72819a29d4ac7902b7be5af0b5d353d790eae
2 files changed