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

Change-Id: I53055ed426d65a6214d19ef11b6f6540c7f6d94c