Update & add patches

Change-Id: Ic3622f2c3be033f8d8d774574e51a4fbb4f18313