Merge "fix(tests): Update assertions to Google Truth assertion" into main