Use UMS default

From Shendu

Change-Id: I043bd3206a36e5c348d53934b2a9ed7a04c2e94b