Merge "Workaround for javac compilation issue of lambda code"