Merge "Fix unnecessarily non-static inner class to static inner" into lmp-dev