Merge "Handle invalid shared GIDs." am: 788bdeae78 am: 477601a9ff am: 4be16dccfe
am: 2d9bf64d9f

Change-Id: I3fb92764c2a0271483e31646c63fbabd1f1c58c6