add recovery and kernel changes

Change-Id: If3df3e1c286559bec15b0fab084941c939272b83