Merge "Try to set the hop limit to something suitable for 64share" am: 666bb5cf28
am: b7a4e9cf21

Change-Id: I8dee0d778f8f35a07690dc12ab768ac76ee4ecb2