Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: Ie12fc66155475444c101f96a2c95d460b3d2f856