[automerger] Merge "One fewer back action in Inline Reply test." into pi-dev am: 29377bbc am: 76cd76db Change-Id: Ic399f44f6c68e894cea8e62434b0e7e40378c264