Merge "Limit when a ranking reconsidering can alert" into oc-dr1-dev am: 48ab20a645
am: dcac8500a6

Change-Id: I3419a6296bc2410b3a1ca5de6e344a9a547ac82b