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

Change-Id: I5c3a01e2bf5ac4d1d40c73d563c473ffa9c44019