DO NOT MERGE Remove Yenta experiment (1/2)
am: abb790c274  -s ours

Change-Id: I74059b4a14640916bb057317f6fe4437eb78f97d