Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I45796a4bd3a0a8da649fe42f9fcc049242cda6e3