Merge master into next

Change-Id: Ic18eaa267e5d90c96efeff6b1354acd02fb63216