Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: Iec6a113d8ca66904de4d170e89bdf1d5af343c00