Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I8f6deb82599ce3fa551e94d398eedc5afe891c6e