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

Change-Id: Iddc289b4b82e3248407147b003a710f6443252e8