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

Change-Id: I83186a86c1222170e93e90e2f752f2751f206d05