am 184dadef: am a854e53f: Merge "Fix unnecessarily non-static inner class to static inner" into lmp-dev

* commit '184dadef6e2b9e3ea827bfc54015a2560faa4421':
  Fix unnecessarily non-static inner class to static inner