Merge "Fix LocalOnlyHotspotReservation double stop of local hotspot." am: c046f9f039 am: aa562f6dc3
am: 48f566d5a9

Change-Id: I433b62544603f3298a6f7314e982c56a78bb0171