Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: If617d92047acec6bf47a80f7eb553d98997e8413