Workaround for javac compilation issue of lambda code
am: e065f7c5a9

Change-Id: I247477c4155ddc154e7fe3f1057a767d1ab74336