Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: Ib46645776f8e4c1d2b3ce2ba37000b1780c0c18c