E2E Encounters patchset tweak

Change-Id: Ie9e917394a69a184244430a61abf1629ce37e209
Signed-off-by: Jeremy Ho <jujaga@gmail.com>