Adapt to recent master

Change-Id: I2b6d6a9dfd1972943ab6f01678d82c58093fb83f
3 files changed