Merge "Fix: "adb install -s" adaptation for session based install" into nyc-mr1-dev am: c468899309 am: 4b39fe4498
am: 6134f12308

Change-Id: I69108c198e2d63c5ff55217834c7c7bc47ac5751