Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I9c6cdf13d58e69cdb33d05f20bf0afcde0e7c8af