Merge "Updated the warning about old-style inner class metadata to reflect the current understanding of the situation." into gingerbread