Merge "Workaround for javac compilation issue of lambda code" into cw-f-dev