Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I302fe67ef62835effc377e6bc664e43b67ba9ed2