Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: Ib38ef1a2fc1867e848cc43dea31d1273180d0fcc