Restore test now that bug has been fixed

Bug: 58320
Change-Id: I8ba260596d8f2cb47cc62f3af4f66d19e65232d5
Merge "Restore test now that bug has been fixed"