Merge changes I09ecc525,I83e7e8ef

* changes:
  Revert "Do not use lambda as it breaks javac"
  Add missing dependency to services for desugaring