Workaround for javac compilation issue of lambda code am: e065f7c5a9 am: 6ce06e63a7
am: 72f59dd7cb

Change-Id: I603a1709e35ba1d34cdd6b8abe9fd981e59166c8