Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I5e285e246180486e0402717d5bcb875cc310eb56