Merge "add missing call to superclass method" into honeycomb