Merge "Moving private classes to innerclasses"