Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: Idc7e6f74dabdecf8ddbc4843555903ed09d508a1