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

Change-Id: I9a43b4843667bdab5909765b1afa99c9f7b11053