Merge "Support adb rescue wipe command" am: 56311071fe
am: 979f05c621

Change-Id: I8bc2ffef336c57b47972b7f37ccfc70ab7a19158