Merge "Restore lost .dm support of adb install-multiple" am: 29553d2d52
am: adeed2708b

Change-Id: I0fd9269f5c9631fc3b72f3b12d2a2eaa681d4777