Merge "Fix issue #3404571: Commit final APIs" into honeycomb