Merge "Remove (now) unnecessary reference to core-lambda-stubs." am: 68e91852c3 am: c1d97c9250
am: 5e7dd0999e

Change-Id: I45e2c290cbed1fcf917d54f6a50a60bfa7540f44