Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: Ia40f89653864980b6aa64db8f36c941aa1a11067