Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: Ie41c120459ec1fdfae8ff512a9b7ff5900edec0e