Merge "Merge "Fix: "adb install -s" adaptation for session based install" into nyc-mr1-dev am: c4688993 am: 4b39fe44 am: 6134f123"