Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I11f90fb85b9b103845f43952c072ed7b6f581afe