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

Change-Id: Ica4b633fd67d3d2bd8b939138c61a64b2022503f