Merge "Remove unimportant assertion" into main