Merge "Fix crash and duplicated ethernet tethering request" am: 41c82c99 am: d74f557c am: 0b64d65f Change-Id: I36a74a8725e5c6b6b7d471d0414cef7c316119a1