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

Change-Id: I3177a3de4dcb4d328a8a54c4fb63af002d40aeeb