Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I084e9a52aaf3384b8dfe24459bde4fbe4313517d