Reopen for 5.8

Change-Id: I01a4224264a42234947bb0e8a68bcebe1a0d7376