Merge "Workaround for javac compilation issue of lambda code"
am: 90e5fc0970

Change-Id: Ie7f376587c793ef9312626e41ee4be40f66de5f4