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

Change-Id: Id21818687508092e41a970b9cd18ddbe15b7d740