Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I6110e9bd758f4e5dc7fa6083962cc87b6ac10fcd