Merge "[ATest python3 migration] fix str.decode() issue in unit tests."