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

Change-Id: I8bfb5e008af1d810b0168e07956e5db6544e81cd