Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I83baa7027fdb3cf2395643fc200b2d0c072234f5