Merge "Fix: "adb install -s" adaptation for session based install am: 4f26cb5a am: 55bcb9f4 am: 4549426d"