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

Change-Id: Ic64d696ecece2387274417325cf53414d016fe8b