Merge "Fix issues with DSU test when run from test infra" am: b4bf19c7df
am: 13e4923a37

Change-Id: I1e607ad8d76a417effd2e0bdaaa4280f0b455c56