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

Change-Id: I7eb80947c4a0170af7e6af4f878f3d15c8587949