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

Change-Id: Iec399c254e41e1c94d67ea2ed5cea637cce148b0