Merge master into next

Change-Id: I862893ff145c320df60b400e8be98ae1e56de666