Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: Ifc6a546ea1a5eb35beffc172fe71a97efa63aff9