Fix issue #3404571: Commit final APIs

Change-Id: I7f01f8df9cfb82a9bb987e3df7c8eaa1c5aab81a
2 files changed