Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I5c79a347d216a326247c17015634fc8f7e49193c