add old patches back

Change-Id: Iff6dc790cf953ef1f61b0541532a66f28c0e8e5f