Correct partitions for recovery

Change-Id: Idbae6bab9b2dff9e048dea22996a8fe25b2d3ec5
Added button support for recovery

Change-Id: I18b2b196a310674dedff643218ebcacbbffa194c