Late-breaking comments on API name. Revised. Bug: 7095660 Change-Id: I7224d9c8a4f84a272360ede78a18bfb72d8aeb77