Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: Ic1e378536e3ef24b932a1ef772671acb3b0dec8b