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

Change-Id: I48c3d8e584a30ed994920f57570344d7736ab183