Merge "Update test names after package changes."
am: 134b52b944

Change-Id: I4e9effb23a8066d9c8478e6812e1a06918bb0f8f