Adapt to recent master

Change-Id: I43f34b8f220ba2b28f1fb37606f1dbf77596218a
4 files changed