Merge \"Direct Reply: Fix circular reveal origin\" into nyc-mr1-dev
am: c50f8ae532

Change-Id: Ib3083e87f162a103acc6483b0f3367db73e1b269