Merge "DO NOT MERGE: Reduce re-ranking" into oc-dr1-dev am: ad75ef4c3b
am: b543340464

Change-Id: I7ec4ac2f90cbfb9e70bf607bb4f2752bbdd692f6