Merge "change to java 8 lambda"