Merge \"Merge \\\"Fix adb backup/restore\\\" into nyc-dev am: 45c79447ad am: c5202cac7f\" into nyc-mr1-dev-plus-aosp
am: ac8a04c06f

Change-Id: I0c0b43d2b223c363abaa57819789dd35940d0ab7