Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I8195daaae19d8675d4596d879768939a27d038e1