Merge "Make test more robust."
am: 362d701d74

Change-Id: I39344d796f2bdbd0151250924398ccb29a48a168