Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: Ibe5ddf63939b697e81cee286be01052fff1f7b05