Merge "Fix: "adb install -s" adaptation for session based install am: 4f26cb5a36 am: 55bcb9f422 am: 4549426d6e"