Merge "Ignore flow label when comparing RAs in APF"
am: 81fda77884

Change-Id: Id1a51e03e5065cabb4645d1e05f5e22ab4e98c0a