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

Change-Id: I849032d9b56c4a1c22ea7f33fe3787db876e1aac