DAO graft from master for E2E support

Change-Id: I0c11a195b15758d4604d917f434cdabfb0912e79
Signed-off-by: Jeremy Ho <jujaga@gmail.com>
Port E2E Export functionality from master to 12.1

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