Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I7d40e545fb4898ad21640e718a411dddb1ab112d