Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I9371161f18c28fbbb24c4c418c87e2e2d76f621c