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