Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: Ifcedcbd8cc9710f77c57962b47a663f2f25b8932