Merge "LocationManager - Handle Shutdown for right User" into nyc-mr1-dev
am: 549c81c270

Change-Id: I5eea9e50bccf2b8d4f52cf46461ae3a929441a82