Merge \"Fix adb backup/restore\" into nyc-dev
am: 45c79447ad

Change-Id: Ieab601b2676f18f068280a9f5dfd8501fd5978f0