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

Change-Id: Id3dcf5c8c755e09af9036e84cc78959f024bb107