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

Change-Id: I910b4740a535536f53b7d7971f497967089872a1