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

Change-Id: Id8bef52d6b5f45202217c303ad30302694dac3e4