Merge "Fix bug 3362375 - API REVIEW: remove unused public 'up' id" into honeycomb