Merge "Stop prefix discovery if an RA prefix arrives in DISCOVERING" am: 1e003f8ef6

Change-Id: Ia51addeb9d1f954a396764ec049213ac216b7c1f