Adjust after changes in core

I6a6c12a9, Id27555c6.

Change-Id: I2e93cfffd7b31b090c93f7911e1e45f2a6619371
Merge "Adjust after changes in core"