Merge "Revert experimental lambda feature."
am: c218427ab9

Change-Id: Id73fbf20e9f119552f1a0b623575d6caf8b414bf