Merge "Workaround for javac compilation issue of lambda code" into cw-f-dev am: 1b6da1f928
am: a0f2404725

Change-Id: I13c96d992efcaf9b205032839840be4b03256c68