Avoid VAB merge when running a DSU am: 2327992678 am: eabac7a6ed

Change-Id: I832af5ea10995811def8d43b01865e7ba024f370