Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I5d49f167899891867cc10452bffdf534d3db2f5e