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

Change-Id: Ib7783ecd435367b8e2d0a75b1f982818cde681f5