fix unit test failure by running on a separate process am: 6027979436
am: 690f7f509b

Change-Id: Ic0e50679b65c47f64e7038a77562314181de973b