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

Change-Id: Ic766abed3d5b2cd2cce4f011667c0df8cc7b0ea0