Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I1fc3b857bc8323598481f8f1dab8f6722a071816