Merge "API change - bug 3370353 and bug 3370338" into honeycomb