Merge "Fix bug 3421901 remove 2 functions from public headers in the SDK." into honeycomb