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

Change-Id: I3f845cb228aa409709da1f8de0444c9843533c01