Merge "update anonymous inner classes with lambdas"