Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: Iaedbbf1e04345f643970f1cb397a9a5936b6a4ec